//
//  ViewController.m
//  Test_git_Rebase_merge
//
//  Created by 朱志佳 on 2019/1/12.
//  Copyright © 2019年 zhuzj. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
}

- (void)testMaster{
    NSLog(@"Master");
}
- (void)testMasterDev{
    NSLog(@"MasterDev");
}

- (void)testMasterDev1{
    NSLog(@"MasterDev1");
}
- (void)testMaster1{
    NSLog(@"Master1");
}

@end
